-
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
sun55iw3: radxa-cubie-a5e: update patches for mainline 6.17 and 6.18 #8831
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
Signed-off-by: Rudi Heitbaum <[email protected]>
Signed-off-by: Rudi Heitbaum <[email protected]>
Hey @heitbaum! 👋Thanks for submitting your first pull request to the Armbian project — we're excited to have you contributing! 🧡 If you'd like to stay informed about project updates or collaborate more closely with the team, Also, don’t forget to ⭐ star the repo if you haven’t already — and welcome aboard! 🚀 |
WalkthroughThis pull request updates kernel version variables in the edge branch configuration for the sun55iw3 family. Two kernel-related parameters are incremented: KERNEL_MAJOR_MINOR is bumped from "6.16" to "6.18", and KERNELBRANCH is updated from "tag:v6.16" to "tag:v6.18-rc4". The KERNELPATCHDIR assignment automatically references the updated major/minor version. No control flow, logic, or error-handling modifications are present. Estimated code review effort🎯 1 (Trivial) | ⏱️ ~3 minutes
Possibly related PRs
Suggested reviewers
Pre-merge checks and finishing touches❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✨ Finishing touches🧪 Generate unit tests (beta)
Comment |
|
I think it would be wise to merge this to sunxi64 patch folder. @The-going How far we are with sunxi EDGE to 6.17 / 6.18 ? |
- https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt-for-6.19 - https://lore-kernel.gnuweeb.org/linux-devicetree/[email protected]/T/ - https://patchwork.kernel.org/project/linux-arm-kernel/cover/[email protected]/ - https://patchwork.kernel.org/project/linux-arm-kernel/cover/[email protected]/ - Refresh the 2nd Ethernet patches to those wating for 6.19 upstream (1) - Refresh the poly-phased patch to the updated RFC patch from mailing-list - Add the thermal patch (from patchwork), detail showed below - Add the I2S and SPDIF TX patch (from patchwork) root@radxa-cubie-a5e:~# sensors axp20x_usb-isa-0000 Adapter: ISA adapter in0: 4.96 V (min = +4.44 V) gpu_thermal-virtual-0 Adapter: Virtual device temp1: +54.9°C cpu4_thermal-virtual-0 Adapter: Virtual device temp1: +56.5°C iio_hwmon-isa-0000 Adapter: ISA adapter in1: 3.65 V temp1: +66.0°C ddr_thermal-virtual-0 Adapter: Virtual device temp1: +56.7°C cpu0_thermal-virtual-0 Adapter: Virtual device temp1: +55.6°C Signed-off-by: Rudi Heitbaum <[email protected]>
|
Update the patch directory for 6.18 to reference the updated upstream/upstream ready patches.
|
|
Just as version 6.16 was declared End of Life (EOL), I was removing and updating already merged patches from 6.17 and 6.18 that stabilize support for Allwinner A523/A527/T527/H728, and this helps. As soon as I have time to test these changes, I can confirm if they work well for me. I also acquired an i2s sound card (respeaker 2 mic 1.1) to test the recently released sound patches. Thanks for this... |
|
6.17 build log: |
|
There is a bug in the config - you keep compiling 6.17.0 ... while its 6.17.7 now. And then patches fail. I didn't check 6.18 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 1
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
Disabled knowledge base sources:
- Jira integration is disabled by default for public repositories
You can enable these sources in your CodeRabbit configuration.
⛔ Files ignored due to path filters (24)
patch/kernel/archive/sunxi-dev-6.17/00-Add-leds-Radxa-Cubie-A5E.patchis excluded by!patch/**patch/kernel/archive/sunxi-dev-6.17/01-Add-wifi-to-Radxa-Cubie-A5E.patchis excluded by!patch/**patch/kernel/archive/sunxi-dev-6.17/07-arm64-dts-allwinner-a527-cubie-a5e-Add-ethernet-PHY-reset-setting.patchis excluded by!patch/**patch/kernel/archive/sunxi-dev-6.17/08-arm64-dts-allwinner-a527-cubie-a5e-Enable-second-Ethernet-port.patchis excluded by!patch/**patch/kernel/archive/sunxi-dev-6.17/11-dt-bindings-net-sun8i-emac-Add-A523-GMAC200-compatible.patchis excluded by!patch/**patch/kernel/archive/sunxi-dev-6.17/16-net-stmmac-Add-support-for-Allwinner-A523-GMAC200.patchis excluded by!patch/**patch/kernel/archive/sunxi-dev-6.17/19-regulator-axp20x-force-polyphase-setup-for-axp323.patchis excluded by!patch/**patch/kernel/archive/sunxi-dev-6.17/20-soc-sunxi-sram-add-entry-for-a523.patchis excluded by!patch/**patch/kernel/archive/sunxi-dev-6.17/21-soc-sunxi-sram-register-regmap-as-syscon.patchis excluded by!patch/**patch/kernel/archive/sunxi-dev-6.17/23-arm64-dts-allwinner-a523-Add-GMAC200-ethernet-controller.patchis excluded by!patch/**patch/kernel/archive/sunxi-dev-6.17/24-Enable-uart1-on-Radxa-Cubie-A5E.patchis excluded by!patch/**patch/kernel/archive/sunxi-dev-6.18/01-arm64-dts-allwinner-a523-Add-GMAC200-ethernet-contro.patchis excluded by!patch/**patch/kernel/archive/sunxi-dev-6.18/02-arm64-dts-allwinner-a527-cubie-a5e-Enable-second-Eth.patchis excluded by!patch/**patch/kernel/archive/sunxi-dev-6.18/03-arm64-dts-allwinner-t527-avaota-a1-enable-second-Eth.patchis excluded by!patch/**patch/kernel/archive/sunxi-dev-6.18/04-arm64-dts-allwinner-t527-orangepi-4a-Enable-Ethernet.patchis excluded by!patch/**patch/kernel/archive/sunxi-dev-6.18/05-dt-bindings-mfd-x-powers-axp152-Add-polyphased-prope.patchis excluded by!patch/**patch/kernel/archive/sunxi-dev-6.18/06-mfd-axp20x-Refactor-axp20x_is_polyphase_slave.patchis excluded by!patch/**patch/kernel/archive/sunxi-dev-6.18/07-mfd-axp20x-Allow-programming-dual-phase-regulator-pa.patchis excluded by!patch/**patch/kernel/archive/sunxi-dev-6.18/08-mfd-axp20x-Support-tri-phase-setup.patchis excluded by!patch/**patch/kernel/archive/sunxi-dev-6.18/09-arm64-dts-allwinner-a523-Mark-dual-phased-regulators.patchis excluded by!patch/**patch/kernel/archive/sunxi-dev-6.18/10-Allwinner-A523-add-support-for-A523-THS0-1-controllers.patchis excluded by!patch/**patch/kernel/archive/sunxi-dev-6.18/11-allwinner-a523-Enable-I2S-and-SPDIF-TX.patchis excluded by!patch/**patch/kernel/archive/sunxi-dev-6.18/20-Add-wifi-to-Radxa-Cubie-A5E.patchis excluded by!patch/**patch/kernel/archive/sunxi-dev-6.18/21-Enable-uart1-on-Radxa-Cubie-A5E.patchis excluded by!patch/**
📒 Files selected for processing (1)
config/sources/families/sun55iw3.conf(1 hunks)
🧰 Additional context used
🧠 Learnings (14)
📓 Common learnings
Learnt from: rpardini
Repo: armbian/build PR: 8044
File: patch/u-boot/v2025.04/cmd-fileenv-read-string-from-file-into-env.patch:76-86
Timestamp: 2025-03-31T22:20:48.475Z
Learning: For the Armbian build project, maintaining consistency with existing patches across U-Boot versions (such as between 2025.01 and 2025.04) is prioritized over refactoring individual patches for code improvements.
Learnt from: rpardini
Repo: armbian/build PR: 8879
File: config/sources/families/uefi-x86.conf:0-0
Timestamp: 2025-11-06T15:36:04.606Z
Learning: As of PR #8879, the uefi-x86 family in the Armbian build system now includes kernel patches for the first time. The current and edge branches for uefi-x86 are specifically configured for Apple T2-based x86 machines, including T2-specific patches from the linux-t2 project and custom kernel configuration options for Apple hardware drivers.
Learnt from: SuperKali
Repo: armbian/build PR: 8608
File: lib/functions/compilation/patch/drivers_network.sh:361-363
Timestamp: 2025-09-11T06:06:52.328Z
Learning: For the RTW88 SDIO RF path detection fix patch (004-rtw88-sdio-rf-path-detection-fix.patch), SuperKali prefers using exact version matching (eq 6.1 || eq 6.16) rather than range checks, as the patch has only been tested on those specific kernel versions and may be mainstreamed soon.
Learnt from: amazingfate
Repo: armbian/build PR: 8453
File: lib/functions/compilation/patch/drivers_network.sh:213-216
Timestamp: 2025-08-02T14:59:28.145Z
Learning: The wireless driver patches wireless-rtl8812au-Fix-6.16.patch, wireless-rtl8811cu-Fix-6.16.patch, and wireless-rtl88x2bu-Fix-6.16.patch in the Armbian build system are backward compatible and can be applied unconditionally without version checks, even though they're named for 6.16+ fixes.
Learnt from: EvilOlaf
Repo: armbian/build PR: 8428
File: config/boards/lckfb-taishanpi.csc:5-9
Timestamp: 2025-07-25T03:51:50.830Z
Learning: When reviewing PRs in the Armbian build system, U-Boot defconfig files and patches may be added as part of the PR changes but might not be visible in the current repository clone state during review. It's important to check the actual PR file changes directly via GitHub API (https://api.github.com/repos/armbian/build/pulls/{pr_number}/files) to get the complete picture of what files are being added or modified, especially for U-Boot patches that will be applied during the build process.
Learnt from: EvilOlaf
Repo: armbian/build PR: 8428
File: config/boards/lckfb-taishanpi.csc:5-9
Timestamp: 2025-07-25T03:51:50.830Z
Learning: When reviewing PRs in the Armbian build system, U-Boot defconfig files and patches may be added as part of the PR changes but might not be visible in the current repository clone state during review. It's important to check the actual PR file changes directly via GitHub or the PR API to get the complete picture of what files are being added or modified.
Learnt from: rpardini
Repo: armbian/build PR: 8044
File: patch/u-boot/v2025.04/cmd-fileenv-read-string-from-file-into-env.patch:73-75
Timestamp: 2025-03-31T22:20:41.849Z
Learning: When porting patches between U-Boot versions (like from 2025.01 to 2025.04), rpardini prefers to maintain patches as-is rather than introducing refactoring changes, even when potential improvements are identified. This approach prioritizes consistency and reduces the risk of introducing new issues.
Learnt from: amazingfate
Repo: armbian/build PR: 8619
File: config/sources/families/rockchip.conf:65-72
Timestamp: 2025-09-14T11:37:35.089Z
Learning: In the Armbian build system, patch directories referenced in BOOTPATCHDIR and KERNELPATCHDIR configurations can be non-existent without causing build failures. Empty patch directories are also ignored by git, so missing patch directories should not be flagged as errors during code review.
Learnt from: leggewie
Repo: armbian/build PR: 0
File: :0-0
Timestamp: 2025-08-29T18:44:47.732Z
Learning: When creating GitHub issues for code improvements in the Armbian build project, include the relevant patches/diffs in the issue description or open a PR directly instead of just describing the changes. This makes it more efficient for the assignee to handle the improvements.
Learnt from: The-going
Repo: armbian/build PR: 8147
File: config/sources/families/include/sunxi64_common.inc:38-39
Timestamp: 2025-04-30T16:16:47.150Z
Learning: The Armbian build system references Linux kernel versions in the form "tag:v6.14.4" in the KERNELBRANCH variable, even when point release tags might not be directly visible in the upstream repository in the same form.
Learnt from: tabrisnet
Repo: armbian/build PR: 8746
File: config/sources/families/filogic.conf:61-68
Timestamp: 2025-10-13T02:26:18.249Z
Learning: In the Armbian build system, the "edge" kernel branch is intended to be bleeding-edge and experimental. It does not require hardware testing or stability verification before merging, as it's expected to contain potentially unstable or untested code for early adopters and developers.
Learnt from: EvilOlaf
Repo: armbian/build PR: 0
File: :0-0
Timestamp: 2025-07-21T04:12:02.439Z
Learning: In the Armbian build system, for recurring maintenance tasks like kernel version bumping, TODO comments should use generic version formats (e.g., "MAJOR.MINOR-rc1") rather than specific version numbers (e.g., "6.17-rc1") to avoid the need for frequent comment updates that would create unnecessary maintenance overhead.
Learnt from: HackingGate
Repo: armbian/build PR: 8665
File: config/boards/photonicat2.csc:4-4
Timestamp: 2025-10-26T10:41:35.118Z
Learning: In the Armbian build system, rk3576 boards consistently use BOARDFAMILY="rk35xx" for both vendor and edge kernel targets. The rk35xx family configuration sources rockchip64_common.inc, which provides edge and current kernel branch definitions, making these branches available even though they're not defined directly in rk35xx.conf.
Learnt from: amazingfate
Repo: armbian/build PR: 8619
File: config/sources/families/rockchip.conf:64-70
Timestamp: 2025-09-14T06:29:18.958Z
Learning: In the Armbian build system, vendor branch configurations in family files are designed to be shared across multiple SoCs within the same family that use the same vendor kernel tree. For example, rk35xx and rockchip-rk3588 families both use identical vendor branch settings (same KERNELSOURCE, KERNELBRANCH, and KERNELPATCHDIR), demonstrating that vendor branches are intentionally generic rather than SoC-specific.
Learnt from: Grippy98
Repo: armbian/build PR: 8152
File: lib/functions/configuration/interactive.sh:209-266
Timestamp: 2025-05-05T12:35:07.143Z
Learning: For the interactive kernel selection in Armbian, KERNEL_MAJOR_MINOR and KERNEL_DESCRIPTION are parsed from family.conf but deliberately not set as environment variables to avoid potential interference with other parts of the build system.
📚 Learning: 2025-06-25T03:42:09.086Z
Learnt from: EvilOlaf
Repo: armbian/build PR: 8330
File: config/sources/families/sun55iw3.conf:32-36
Timestamp: 2025-06-25T03:42:09.086Z
Learning: In Armbian build system configuration files like config/sources/families/*.conf, KERNELSOURCE is explicitly declared when using unofficial or 3rd party kernel repositories (like the "dev" branch using https://github.com/apritzel/linux), but can be omitted when using the standard mainline kernel (like the "edge" branch) since it will fall back to the default mainline source.
Applied to files:
config/sources/families/sun55iw3.conf
📚 Learning: 2025-06-25T03:40:52.109Z
Learnt from: EvilOlaf
Repo: armbian/build PR: 8330
File: config/sources/families/sun55iw3.conf:32-36
Timestamp: 2025-06-25T03:40:52.109Z
Learning: In Armbian build system configuration files like config/sources/families/*.conf, when KERNELSOURCE is not explicitly declared in a case branch, the system falls back to a default KERNELSOURCE value, so missing KERNELSOURCE declarations are not critical issues.
Applied to files:
config/sources/families/sun55iw3.conf
📚 Learning: 2025-10-26T10:41:35.118Z
Learnt from: HackingGate
Repo: armbian/build PR: 8665
File: config/boards/photonicat2.csc:4-4
Timestamp: 2025-10-26T10:41:35.118Z
Learning: In the Armbian build system, rk3576 boards consistently use BOARDFAMILY="rk35xx" for both vendor and edge kernel targets. The rk35xx family configuration sources rockchip64_common.inc, which provides edge and current kernel branch definitions, making these branches available even though they're not defined directly in rk35xx.conf.
Applied to files:
config/sources/families/sun55iw3.conf
📚 Learning: 2025-04-30T16:16:47.150Z
Learnt from: The-going
Repo: armbian/build PR: 8147
File: config/sources/families/include/sunxi64_common.inc:38-39
Timestamp: 2025-04-30T16:16:47.150Z
Learning: The Armbian build system references Linux kernel versions in the form "tag:v6.14.4" in the KERNELBRANCH variable, even when point release tags might not be directly visible in the upstream repository in the same form.
Applied to files:
config/sources/families/sun55iw3.conf
📚 Learning: 2025-11-02T20:49:56.719Z
Learnt from: igorpecovnik
Repo: armbian/build PR: 8849
File: config/boards/radxa-e54c.csc:14-28
Timestamp: 2025-11-02T20:49:56.719Z
Learning: In Armbian board configuration files (config/boards/*.conf, *.csc, etc.), do not use kernel_config_set, kernel_config_set_m, kernel_config_set_y, or custom_kernel_config__* functions to modify kernel configuration. Kernel configuration is associated with LINUXFAMILY/BOARDFAMILY, not individual BOARD. Board-specific kernel modifications cause inconsistency in kernel packages published to the apt repository because boards within a family share the same kernel packages. Kernel configuration changes must be made in the appropriate kernel config file (e.g., config/kernel/linux-*-*.config) or in family configuration files (config/sources/families/*.conf, *.inc) instead.
Applied to files:
config/sources/families/sun55iw3.conf
📚 Learning: 2025-09-14T06:29:18.958Z
Learnt from: amazingfate
Repo: armbian/build PR: 8619
File: config/sources/families/rockchip.conf:64-70
Timestamp: 2025-09-14T06:29:18.958Z
Learning: In the Armbian build system, vendor branch configurations in family files are designed to be shared across multiple SoCs within the same family that use the same vendor kernel tree. For example, rk35xx and rockchip-rk3588 families both use identical vendor branch settings (same KERNELSOURCE, KERNELBRANCH, and KERNELPATCHDIR), demonstrating that vendor branches are intentionally generic rather than SoC-specific.
Applied to files:
config/sources/families/sun55iw3.conf
📚 Learning: 2025-10-13T02:26:18.249Z
Learnt from: tabrisnet
Repo: armbian/build PR: 8746
File: config/sources/families/filogic.conf:61-68
Timestamp: 2025-10-13T02:26:18.249Z
Learning: In the Armbian build system, the "edge" kernel branch is intended to be bleeding-edge and experimental. It does not require hardware testing or stability verification before merging, as it's expected to contain potentially unstable or untested code for early adopters and developers.
Applied to files:
config/sources/families/sun55iw3.conf
📚 Learning: 2025-07-21T04:12:02.439Z
Learnt from: EvilOlaf
Repo: armbian/build PR: 0
File: :0-0
Timestamp: 2025-07-21T04:12:02.439Z
Learning: In the Armbian build system, for recurring maintenance tasks like kernel version bumping, TODO comments should use generic version formats (e.g., "MAJOR.MINOR-rc1") rather than specific version numbers (e.g., "6.17-rc1") to avoid the need for frequent comment updates that would create unnecessary maintenance overhead.
Applied to files:
config/sources/families/sun55iw3.conf
📚 Learning: 2025-05-05T12:35:07.143Z
Learnt from: Grippy98
Repo: armbian/build PR: 8152
File: lib/functions/configuration/interactive.sh:209-266
Timestamp: 2025-05-05T12:35:07.143Z
Learning: For the interactive kernel selection in Armbian, KERNEL_MAJOR_MINOR and KERNEL_DESCRIPTION are parsed from family.conf but deliberately not set as environment variables to avoid potential interference with other parts of the build system.
Applied to files:
config/sources/families/sun55iw3.conf
📚 Learning: 2025-11-06T15:36:04.606Z
Learnt from: rpardini
Repo: armbian/build PR: 8879
File: config/sources/families/uefi-x86.conf:0-0
Timestamp: 2025-11-06T15:36:04.606Z
Learning: As of PR #8879, the uefi-x86 family in the Armbian build system now includes kernel patches for the first time. The current and edge branches for uefi-x86 are specifically configured for Apple T2-based x86 machines, including T2-specific patches from the linux-t2 project and custom kernel configuration options for Apple hardware drivers.
Applied to files:
config/sources/families/sun55iw3.conf
📚 Learning: 2025-10-14T05:08:11.785Z
Learnt from: EvilOlaf
Repo: armbian/build PR: 8754
File: config/boards/bestv-r3300-l.csc:14-16
Timestamp: 2025-10-14T05:08:11.785Z
Learning: In the Armbian build system, BOOTBRANCH_BOARD is a valid framework variable used as a fallback when BOOTBRANCH is unset. The framework checks BOOTBRANCH_BOARD before applying the default bootloader branch value (see config/sources/common.conf). Board configuration files can use BOOTBRANCH_BOARD to specify the bootloader branch.
Applied to files:
config/sources/families/sun55iw3.conf
📚 Learning: 2025-08-21T08:10:59.502Z
Learnt from: leggewie
Repo: armbian/build PR: 8524
File: config/boards/orangepi2.csc:6-6
Timestamp: 2025-08-21T08:10:59.502Z
Learning: Not all Armbian boards support all kernel versions (legacy, current, edge). Some boards may only support specific kernel versions due to hardware limitations or lack of mainline support, which is why their KERNEL_TARGET contains only the supported options (e.g., just "legacy").
Applied to files:
config/sources/families/sun55iw3.conf
📚 Learning: 2025-08-02T05:46:10.664Z
Learnt from: EvilOlaf
Repo: armbian/build PR: 0
File: :0-0
Timestamp: 2025-08-02T05:46:10.664Z
Learning: In the Armbian build system, the modern recommended approach for kernel configuration is to use the kernel-config command via "./compile.sh BOARD=boardname BRANCH=branchname kernel-config" instead of the deprecated KERNEL_CONFIGURE=yes flag. This provides a two-step workflow: configure using menuconfig, then build, with better transparency and control over configuration changes.
Applied to files:
config/sources/families/sun55iw3.conf
| declare -g KERNEL_MAJOR_MINOR="6.18" # Major and minor versions of this kernel. | ||
| declare -g KERNELBRANCH="tag:v6.18-rc4" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Critical: Kernel version contradicts maintainer feedback and PR objectives.
The PR description states patches support "both Linux 6.17 and 6.18-rc3," but igorpecovnik's comment explicitly identified a "configuration bug" and provided the intended fix: KERNEL_MAJOR_MINOR="6.17" and KERNELBRANCH="tag:v6.17.7". The current code sets these to "6.18" and "tag:v6.18-rc4" respectively, which:
- Contradicts the maintainer's intended configuration (6.17.7 stable, not 6.18-rc4)
- Shows only edge branch support, with no visible current branch for 6.17
- Uses 6.18-rc4 instead of the tested 6.18-rc3 mentioned in the PR description
Based on igorpecovnik's feedback, apply this diff to use the stable 6.17.7 release:
- declare -g KERNEL_MAJOR_MINOR="6.18" # Major and minor versions of this kernel.
- declare -g KERNELBRANCH="tag:v6.18-rc4"
+ declare -g KERNEL_MAJOR_MINOR="6.17" # Major and minor versions of this kernel.
+ declare -g KERNELBRANCH="tag:v6.17.7"If both 6.17 and 6.18 support is needed, please clarify whether a separate current branch case should be added or if only edge (6.17) is intended at this time.
🤖 Prompt for AI Agents
In config/sources/families/sun55iw3.conf around lines 28-29, the kernel
variables are incorrect for the maintainer-intended configuration; update
KERNEL_MAJOR_MINOR to "6.17" and KERNELBRANCH to "tag:v6.17.7" to match
igorpecovnik's feedback (stable 6.17.7), and if support for both 6.17 and 6.18
is required instead, add a clear branching/`current` case to select between the
two versions rather than leaving the file pointing to 6.18-rc4.
Description
Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
Upstream have merged the patches being carried in 6.17 and 6.18. Update the patches to support builds of radxa-cubie-a5e with both 6.17 and 6.18-rc3
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration.
Checklist:
Please delete options that are not relevant.
cc: @juanesf